Let stmwpp only create one kind of GPS data.

Waypoints or a route with routepoints.
Reference data changed!

diff --git a/gpsbabel/reference/route/stmwpp-route.gpx b/gpsbabel/reference/route/stmwpp-route.gpx
index c3690762d523d92cf3517222d1b00ff6016ce9be..0d1ee22ce538be7280392100231f1d16d9e3c179 100644 (file)
--- a/gpsbabel/reference/route/stmwpp-route.gpx
+++ b/gpsbabel/reference/route/stmwpp-route.gpx
@@ -61,42 +61,4 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
   <cmt>Völkerschlachtdenkmal</cmt>
   <desc>Völkerschlachtdenkmal</desc>
 </wpt>
-<rte>
-  <rtept lat="50.492618900" lon="12.105448700">
-<time>2005-09-03T00:00:00Z</time>
-    <name>NARVA</name>
-  </rtept>
-  <rtept lat="50.493836900" lon="12.106101000">
-<time>2005-09-03T00:00:00Z</time>
-    <name>Liebknechtstras</name>
-  </rtept>
-  <rtept lat="50.493662800" lon="12.107152400">
-<time>2005-09-03T00:00:00Z</time>
-    <name>Jahnstrasse11</name>
-  </rtept>
-  <rtept lat="50.610795200" lon="12.173802200">
-<time>2005-09-03T00:00:00Z</time>
-    <name>Elsterberg</name>
-  </rtept>
-  <rtept lat="50.654763000" lon="12.204956700">
-<time>2005-09-03T00:00:00Z</time>
-    <name>Greiz</name>
-  </rtept>
-  <rtept lat="50.844125600" lon="12.408757200">
-<time>2005-09-03T00:00:00Z</time>
-    <name>Gosel</name>
-  </rtept>
-  <rtept lat="50.877340500" lon="12.433888700">
-<time>2005-09-03T00:00:00Z</time>
-    <name>3</name>
-  </rtept>
-  <rtept lat="50.964955100" lon="12.435919300">
-<time>2005-09-03T00:00:00Z</time>
-    <name>Altenburg-Umgehung</name>
-  </rtept>
-  <rtept lat="51.314520700" lon="12.409143300">
-<time>2005-09-03T00:00:00Z</time>
-    <name>Völkerschlachtdenkmal</name>
-  </rtept>
-</rte>
 </gpx>

diff --git a/gpsbabel/stmwpp.c b/gpsbabel/stmwpp.c
index ba56400da0f54c6fc3c08be78188823a3d50b41a..6fb4c4c7c8fbb026d06783164318fab2ec46cd00 100644 (file)
--- a/gpsbabel/stmwpp.c
+++ b/gpsbabel/stmwpp.c
@@ -36,6 +36,7 @@ static waypoint *wpt;
 #define STM_NOTHING    0
 #define STM_WAYPT      1
 #define STM_TRKPT      2
+#define STM_RTEPT      3
 
 static int track_index;
 static int track_num;
@@ -152,16 +153,18 @@ stmwpp_data_read(void)
 
                        switch(what)
                        {
-                               case STM_WAYPT:
-                                       waypt_add(waypt_dupe(wpt));
-                                       if (route == NULL)
-                                       {
-                                               route = route_head_alloc();
-                                               route_add_head(route);
+                               case STM_RTEPT:
+                                       if (route == NULL) {
+                                           route = route_head_alloc();
+                                           route_add_head(route);
                                        }
                                        route_add_wpt(route, wpt);
                                        break;
                                        
+                               case STM_WAYPT:
+                                       waypt_add(wpt);
+                                       break;
+                                       
                                case STM_TRKPT:
                                        if (track == NULL)
                                        {
@@ -270,7 +273,7 @@ stmwpp_data_write(void)
                        waypt_disp_all(stmwpp_waypt_cb);
                        break;
                case rtedata:
-                       what = STM_WAYPT;
+                       what = STM_RTEPT;
                        route_disp_all(stmwpp_track_hdr, stmwpp_track_tlr, stmwpp_waypt_cb);
                        break;
                case trkdata: